From: Kim F. Storm <storm@cua.dk>
Date: Mon, 5 Apr 2004 21:54:02 +0000 (+0000)
Subject: (clear_mouse_face): Only clear mouse highlight if not	hidden.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23346
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a5f0540624d5f16de68ff66bebb22b82d9290071;p=emacs.git

(clear_mouse_face): Only clear mouse highlight if not	hidden.
(dos_rawgetc): Set mouse_face_hidden after clearing highlight.
---

diff --git a/src/msdos.c b/src/msdos.c
index a2fd011e74c..c58dc6875fe 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1329,7 +1329,7 @@ show_mouse_face (struct display_info *dpyinfo, int hl)
 static void
 clear_mouse_face (struct display_info *dpyinfo)
 {
-  if (! NILP (dpyinfo->mouse_face_window))
+  if (!dpyinfo->mouse_face_hidden && ! NILP (dpyinfo->mouse_face_window))
     show_mouse_face (dpyinfo, 0);
 
   dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
@@ -3131,7 +3131,7 @@ dos_rawgetc ()
   union REGS regs;
   struct display_info *dpyinfo = FRAME_X_DISPLAY_INFO (SELECTED_FRAME());
   EVENT_INIT (event);
-  
+
 #ifndef HAVE_X_WINDOWS
   /* Maybe put the cursor where it should be.  */
   IT_cmgoto (SELECTED_FRAME());
@@ -3342,8 +3342,8 @@ dos_rawgetc ()
 
       if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
 	{
-	  dpyinfo->mouse_face_hidden = 1;
 	  clear_mouse_face (dpyinfo);
+	  dpyinfo->mouse_face_hidden = 1;
 	}
 
       if (code >= 0x100)